Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Mon, 9 Apr 2012 19:51:35 +0000 (12:51 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Mon, 9 Apr 2012 19:51:35 +0000 (12:51 -0700)
commitbeedf0d7fdfd89babf3a67ebc3faba0acd8f7518
treece54d237f6d4c92d6a45008f6dc2bb06570761b3
parent2396f7815eed94726a68fddc1369c2b4e393e7fd
parent27498b86b0aec3ee4ed14830a6dcf097c4b2ebd5
Merge from trunk.